Merge pull request #1583 from danielboulby-arm/db/AArch32_Multi_Console

Enable Multi Console API in AArch32

diff --cc Makefile
Simple merge

diff --cc plat/arm/common/arm_common.mk
index 276f7801caab1b7c0aa45cfb69cbb90c4531daff,7cdafc65e0ba604b5cae5a9bef8aa842d86b20f9..3fb1eff2d8a4b2fca94b5b666b3f7f9fff9163cd
--- 1/plat/arm/common/arm_common.mk
--- 2/plat/arm/common/arm_common.mk
+++ b/plat/arm/common/arm_common.mk
@@@ -122,11 -122,15 +122,9 @@@ ENABLE_PMF                       :=      
  # mapping the former as executable and the latter as execute-never.
  SEPARATE_CODE_AND_RODATA      :=      1
  
 -# Enable new version of image loading on ARM platforms
 -LOAD_IMAGE_V2                 :=      1
 -
  # Use the multi console API, which is only available for AArch64 for now
- ifeq (${ARCH}, aarch64)
-   MULTI_CONSOLE_API           :=      1
- endif
+ MULTI_CONSOLE_API             :=      1
  
 -# Use generic OID definition (tbbr_oid.h)
 -USE_TBBR_DEFS                 :=      1
 -
  # Disable ARM Cryptocell by default
  ARM_CRYPTOCELL_INTEG          :=      0
  $(eval $(call assert_boolean,ARM_CRYPTOCELL_INTEG))

diff --cc plat/common/aarch32/plat_sp_min_common.c
index a9a92c7e5a79eeb53db627ad4671084cdb58f55b,57559c8af0fa233a649409a16f9f845e5f265f73..f1b1e9c9f765541fef0544edc669403052f4c046
--- 1/plat/common/aarch32/plat_sp_min_common.c
--- 2/plat/common/aarch32/plat_sp_min_common.c
+++ b/plat/common/aarch32/plat_sp_min_common.c
@@@ -21,5 -21,20 +21,9 @@@ void sp_min_plat_runtime_setup(void
         * Finish the use of console driver in SP_MIN so that any runtime logs
         * from SP_MIN will be suppressed.
         */
+ #if MULTI_CONSOLE_API
+       console_switch_state(CONSOLE_FLAG_RUNTIME);
+ #else
        console_uninit();
+ #endif
  }
 -
 -#if !ERROR_DEPRECATED
 -
 -#pragma weak sp_min_early_platform_setup2
 -
 -void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1,
 -                      u_register_t arg2, u_register_t arg3)
 -{
 -      sp_min_early_platform_setup((void *)arg0, (void *)arg1);
 -}
 -#endif